*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 328ccf66cc8e55d323bd55cc07cd93c1623bad66..51af30f03dd3e2cbe304ae9b6f4fa5e046a9a6b4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-28  Juri Linkov  <juri@jurta.org>
+
+       * startup.el: Always add initial message to *scratch* buffer if
+       `initial-scratch-message' is non-nil regardless of the value of
+       `inhibit-startup-screen'.
+       (inhibit-startup-screen, initial-scratch-message): Doc fix.
+       (command-line-1): Move code that inserts `initial-scratch-message'
+       up before the if-form that checks for `inhibit-startup-screen'.
+       Suggested by Jonathan Rockway <jon@jrock.us>.
+
 2008-02-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * textmodes/fill.el (fill-comment-paragraph): Don't try to do